Revision: bazaar--devel--1.1--patch-68
Archive: robert.collins@canonical.com--general
Creator: Robert Collins <robert.collins@canonical.com>
Date: Tue Jan 11 19:32:03 EST 2005
Standard-date: 2005-01-11 08:32:03 GMT
Modified-files: commands/diff.c tests/test-diff.sh
    tests/test-mv-explicit-baz.sh tests/test-mv-explicit.sh
New-patches: jblack@gnuarch.org--2004/baz--diffnoinventory--1.1--base-0
    jblack@gnuarch.org--2004/baz--diffnoinventory--1.1--patch-1
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-68
    thelove@canonical.com/bazaar--devo--1.1--patch-105
    thelove@canonical.com/bazaar--devo--1.1--patch-106
    thelove@canonical.com/bazaar--devo--1.1--patch-107
    thelove@canonical.com/bazaar--devo--1.1--patch-108
Summary: merge from thelove@canonical.com/bazaar--devo--1.1
Keywords: 

Patches applied:

 * jblack@gnuarch.org--2004/baz--diffnoinventory--1.1--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-104

 * jblack@gnuarch.org--2004/baz--diffnoinventory--1.1--patch-1
   inventory gone from diff. Fixing up the test cases dependant upon no longer using diff took forever to fix. Does anybody read these?

 * thelove@canonical.com/bazaar--devo--1.1--patch-105
   quite the warning about the tree-paths inode data being missing, its just confusing. closes: #5285

 * thelove@canonical.com/bazaar--devo--1.1--patch-106
   change references to star-merge to merge in the UI, closes: #5284

 * thelove@canonical.com/bazaar--devo--1.1--patch-107
   arch_cached_archive_connect was not preserving the requested archive name, breaking the use of arch->name throughout libarch. closes: #5393

 * thelove@canonical.com/bazaar--devo--1.1--patch-108
   baz diff no longer shows inventory, with gobs of test case changes (fixes #4726)

